From 77258acf7b7537f4adb9db2ebf2a45408b72208d Mon Sep 17 00:00:00 2001 From: Bernd Zeimetz Date: Tue, 13 May 2014 00:55:21 +0200 Subject: [PATCH] Refreshing patches --- debian/patches/gpsbabelfe-name | 2 +- .../patches/gpsbabelfe_disable_version_check | 32 ++++----- .../gpsbabelfe_do-not-check-for-newer-version | 72 +++++++++---------- ...gpsbabelfe_opt-in-for-usage-data-reporting | 16 ++--- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/debian/patches/gpsbabelfe-name b/debian/patches/gpsbabelfe-name index 48709e213..2df9c7c38 100644 --- a/debian/patches/gpsbabelfe-name +++ b/debian/patches/gpsbabelfe-name @@ -1,7 +1,7 @@ Rename gpsbabelfe binary. --- a/gpsbabel/gui/app.pro +++ b/gpsbabel/gui/app.pro -@@ -31,7 +31,7 @@ win32 { +@@ -36,7 +36,7 @@ win32 { TARGET=GPSBabelFE QMAKE_LFLAGS_RELEASE += -static-libgcc } diff --git a/debian/patches/gpsbabelfe_disable_version_check b/debian/patches/gpsbabelfe_disable_version_check index 4f404300b..212cab176 100644 --- a/debian/patches/gpsbabelfe_disable_version_check +++ b/debian/patches/gpsbabelfe_disable_version_check @@ -16,32 +16,32 @@ Disable version mismatch check. ---- a/gpsbabel/gui/preferences.cpp -+++ b/gpsbabel/gui/preferences.cpp +--- a/gpsbabel/gui/preferences.cc ++++ b/gpsbabel/gui/preferences.cc @@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent - ui_.startupCheck->setChecked(bd_.startupVersionCheck); - ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics); -- ui_.ignoreVersionMismatchCheck->setChecked(bd_.ignoreVersionMismatch); + ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); + ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); +- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_); // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. if (VERSION == QString("1.4.1")) - bd_.ignoreVersionMismatch = false; + babelData_.ignoreVersionMismatch_ = false; @@ -84,7 +83,6 @@ void Preferences::acceptClicked() - bd_.startupVersionCheck = ui_.startupCheck->isChecked(); - bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked(); -- bd_.ignoreVersionMismatch = ui_.ignoreVersionMismatchCheck->isChecked(); + babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); + babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); +- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked(); accept(); } --- a/gpsbabel/gui/babeldata.h +++ b/gpsbabel/gui/babeldata.h @@ -66,7 +66,7 @@ public: - startupVersionCheck(true), - reportStatistics(true), - allowBetaUpgrades(false), -- ignoreVersionMismatch(false), -+ ignoreVersionMismatch(true), - disableDonateDialog(false), - donateSplashed(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0))) + startupVersionCheck_(true), + reportStatistics_(true), + allowBetaUpgrades_(false), +- ignoreVersionMismatch_(false), ++ ignoreVersionMismatch_(true), + disableDonateDialog_(false), + donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0))) { diff --git a/debian/patches/gpsbabelfe_do-not-check-for-newer-version b/debian/patches/gpsbabelfe_do-not-check-for-newer-version index e363516bb..1493dd56f 100644 --- a/debian/patches/gpsbabelfe_do-not-check-for-newer-version +++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version @@ -16,38 +16,38 @@ Disable check for newer versions on start. Anonymously report usage data. ---- a/gpsbabel/gui/preferences.cpp -+++ b/gpsbabel/gui/preferences.cpp +--- a/gpsbabel/gui/preferences.cc ++++ b/gpsbabel/gui/preferences.cc @@ -39,7 +39,6 @@ Preferences::Preferences(QWidget* parent { ui_.setupUi(this); -- ui_.startupCheck->setChecked(bd_.startupVersionCheck); - ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics); +- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); + ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. if (VERSION == QString("1.4.1")) @@ -81,7 +80,6 @@ void Preferences::acceptClicked() formatList_[i].setHidden(item->checkState() == Qt::Unchecked); } -- bd_.startupVersionCheck = ui_.startupCheck->isChecked(); - bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked(); +- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); + babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); accept(); } --- a/gpsbabel/gui/babeldata.h +++ b/gpsbabel/gui/babeldata.h @@ -63,7 +63,7 @@ public: - upgradeErrors(0), - upgradeOffers(0), - runCount(0), -- startupVersionCheck(true), -+ startupVersionCheck(false), - reportStatistics(false), - allowBetaUpgrades(false), - ignoreVersionMismatch(true), + upgradeErrors_(0), + upgradeOffers_(0), + runCount_(0), +- startupVersionCheck_(true), ++ startupVersionCheck_(false), + reportStatistics_(false), + allowBetaUpgrades_(false), + ignoreVersionMismatch_(true), --- a/gpsbabel/gui/mainwinui.ui +++ b/gpsbabel/gui/mainwinui.ui -@@ -641,7 +641,6 @@ +@@ -651,7 +651,6 @@ @@ -55,7 +55,7 @@ Disable check for newer versions on start. -@@ -670,11 +669,6 @@ +@@ -680,11 +679,6 @@ Preferences... @@ -67,44 +67,44 @@ Disable check for newer versions on start. Visit Website... ---- a/gpsbabel/gui/mainwindow.cpp -+++ b/gpsbabel/gui/mainwindow.cpp -@@ -162,7 +162,6 @@ MainWindow::MainWindow(QWidget* parent): - connect(ui.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX())); - connect(ui.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX())); - connect(ui.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX())); -- connect(ui.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX())); - connect(ui.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX())); +--- a/gpsbabel/gui/mainwindow.cc ++++ b/gpsbabel/gui/mainwindow.cc +@@ -172,7 +172,6 @@ MainWindow::MainWindow(QWidget* parent): + connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX())); + connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX())); + connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX())); +- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX())); + connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX())); - connect(ui.inputFormatCombo, SIGNAL(currentIndexChanged(int)), -@@ -218,19 +217,8 @@ MainWindow::MainWindow(QWidget* parent): + connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)), +@@ -231,19 +230,7 @@ MainWindow::MainWindow(QWidget* parent): //--- Restore from registry restoreSettings(); - - upgrade = new UpgradeCheck(parent, formatList, bd); -- if (bd.startupVersionCheck) { -- upgrade->checkForUpgrade(babelVersion, bd.upgradeCheckTime, + upgrade = new UpgradeCheck(parent, formatList_, babelData_); +- if (babelData_.startupVersionCheck_) { +- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_, - allowBetaUpgrades()); - } - -- if (!bd.ignoreVersionMismatch && babelVersion != VERSION) { -- VersionMismatch vm(0, babelVersion, QString(VERSION)); - +- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) { +- VersionMismatch vm(0, babelVersion_, QString(VERSION)); +- - vm.exec(); -- bd.ignoreVersionMismatch = vm.neverAgain(); +- babelData_.ignoreVersionMismatch_ = vm.neverAgain(); - } } //------------------------------------------------------------------------ -@@ -1060,10 +1048,6 @@ void MainWindow::applyActionX() +@@ -1074,10 +1061,6 @@ void MainWindow::applyActionX() //------------------------------------------------------------------------ void MainWindow::closeActionX() { - QDateTime wt= upgrade->getUpgradeWarningTime(); - if (wt.isValid()) { -- bd.upgradeCheckTime = wt; +- babelData_.upgradeCheckTime_ = wt; - } - bd.runCount++; + babelData_.runCount_++; QDateTime now = QDateTime::currentDateTime(); diff --git a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting index f3c319b56..7df0d4222 100644 --- a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting +++ b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting @@ -2,11 +2,11 @@ Make statistics reporting an opt-in option. --- a/gpsbabel/gui/babeldata.h +++ b/gpsbabel/gui/babeldata.h @@ -64,7 +64,7 @@ public: - upgradeOffers(0), - runCount(0), - startupVersionCheck(true), -- reportStatistics(true), -+ reportStatistics(false), - allowBetaUpgrades(false), - ignoreVersionMismatch(true), - disableDonateDialog(false), + upgradeOffers_(0), + runCount_(0), + startupVersionCheck_(true), +- reportStatistics_(true), ++ reportStatistics_(false), + allowBetaUpgrades_(false), + ignoreVersionMismatch_(true), + disableDonateDialog_(false), -- 2.30.2